Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <[email protected]>
Sat, 9 Aug 2008 23:01:41 +0000 (01:01 +0200)
committerWolfgang Denk <[email protected]>
Sat, 9 Aug 2008 23:01:41 +0000 (01:01 +0200)

Trivial merge